Draw line with the current state, not GTK_STATE_NORMAL

Sat Jun 26 17:41:10 2004  Soeren Sandmann  <sandmann@daimi.au.dk>

        * gtk/gtk[hv]separator.c (gtk_[hv]separator_expose): Draw line with the
        current state, not GTK_STATE_NORMAL

        * gtk/gtkframe.c (gtk_frame_paint): Fix a rounding error

diff --git a/ChangeLog b/ChangeLog
index 6019f0ef23d79f459c67d71d0ed98492565f6bca..4a4172357d0b998924bbf5f6a2a48b823a0d5df7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Jun 26 17:41:10 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtk[hv]separator.c (gtk_[hv]separator_expose): Draw line with the
+       current state, not GTK_STATE_NORMAL
+
+       * gtk/gtkframe.c (gtk_frame_paint): Fix a rounding error
+
 Sat Jun 26 15:07:25 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkstyle.c, gtk/gtkrc.c: small color tweak. (#141173)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6019f0ef23d79f459c67d71d0ed98492565f6bca..4a4172357d0b998924bbf5f6a2a48b823a0d5df7 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Sat Jun 26 17:41:10 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtk[hv]separator.c (gtk_[hv]separator_expose): Draw line with the
+       current state, not GTK_STATE_NORMAL
+
+       * gtk/gtkframe.c (gtk_frame_paint): Fix a rounding error
+
 Sat Jun 26 15:07:25 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkstyle.c, gtk/gtkrc.c: small color tweak. (#141173)

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6019f0ef23d79f459c67d71d0ed98492565f6bca..4a4172357d0b998924bbf5f6a2a48b823a0d5df7 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Sat Jun 26 17:41:10 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtk[hv]separator.c (gtk_[hv]separator_expose): Draw line with the
+       current state, not GTK_STATE_NORMAL
+
+       * gtk/gtkframe.c (gtk_frame_paint): Fix a rounding error
+
 Sat Jun 26 15:07:25 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkstyle.c, gtk/gtkrc.c: small color tweak. (#141173)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6019f0ef23d79f459c67d71d0ed98492565f6bca..4a4172357d0b998924bbf5f6a2a48b823a0d5df7 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Sat Jun 26 17:41:10 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtk[hv]separator.c (gtk_[hv]separator_expose): Draw line with the
+       current state, not GTK_STATE_NORMAL
+
+       * gtk/gtkframe.c (gtk_frame_paint): Fix a rounding error
+
 Sat Jun 26 15:07:25 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkstyle.c, gtk/gtkrc.c: small color tweak. (#141173)

diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c
index 02a59c55f48265d6b96c9d98442e84410b395b83..8cd7340ac3adfc874b3fe132bdbac94598e366d8 100644 (file)
--- a/gtk/gtkframe.c
+++ b/gtk/gtkframe.c
@@ -557,8 +557,9 @@ gtk_frame_paint (GtkWidget    *widget,
            xalign = 1 - frame->label_xalign;
 
          height_extra = MAX (0, child_requisition.height - widget->style->ythickness);
-         y -= height_extra * (1 - frame->label_yalign);
-         height += height_extra * (1 - frame->label_yalign);
+         height_extra *= (1 - frame->label_yalign);
+         y -= height_extra;
+         height += height_extra;
          
          x2 = widget->style->xthickness + (frame->child_allocation.width - child_requisition.width - 2 * LABEL_PAD - 2 * LABEL_SIDE_PAD) * xalign + LABEL_SIDE_PAD;
 

diff --git a/gtk/gtkhseparator.c b/gtk/gtkhseparator.c
index d75212741216af53509517a2a9b2a3d78b227add..a082c15c9ce1bf7e97ba7d6927c24f51e8807a2e 100644 (file)
--- a/gtk/gtkhseparator.c
+++ b/gtk/gtkhseparator.c
@@ -91,7 +91,7 @@ gtk_hseparator_expose (GtkWidget      *widget,
                       GdkEventExpose *event)
 {
   if (GTK_WIDGET_DRAWABLE (widget))
-    gtk_paint_hline (widget->style, widget->window, GTK_STATE_NORMAL,
+    gtk_paint_hline (widget->style, widget->window, GTK_WIDGET_STATE (widget),
                     &event->area, widget, "hseparator",
                     widget->allocation.x,
                     widget->allocation.x + widget->allocation.width - 1,

diff --git a/gtk/gtkvseparator.c b/gtk/gtkvseparator.c
index 872fd54a8e26aa01fa89477ab667245c71ed622b..f4cfe6729c9611898641eb9848e80f29f82104ff 100644 (file)
--- a/gtk/gtkvseparator.c
+++ b/gtk/gtkvseparator.c
@@ -91,7 +91,7 @@ gtk_vseparator_expose (GtkWidget      *widget,
                       GdkEventExpose *event)
 {
   if (GTK_WIDGET_DRAWABLE (widget))
-    gtk_paint_vline (widget->style, widget->window, GTK_STATE_NORMAL,
+    gtk_paint_vline (widget->style, widget->window, GTK_WIDGET_STATE (widget),
                     &event->area, widget, "vseparator",
                     widget->allocation.y,
                     widget->allocation.y + widget->allocation.height - 1,